Revert arcade dependency update from PR #12622#12634
Conversation
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 12634Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 12634" |
Co-authored-by: eerhardt <8291187+eerhardt@users.noreply.github.com>
|
Marking as auto-merge to fix the build in main |
There was a problem hiding this comment.
Pull Request Overview
This PR rolls back Microsoft.DotNet.Arcade SDK and related toolset dependencies from version 11.0.0-beta.25531.1 to 11.0.0-beta.25509.1, and removes obsolete runtime source feed parameters that are no longer needed in the build infrastructure.
Key changes:
- Downgrade Arcade SDK and related packages to beta.25509.1
- Remove
runtimeSourceFeedandruntimeSourceFeedKeyparameters from build scripts and CI/CD templates - Standardize YAML indentation and remove unused template steps
Reviewed Changes
Copilot reviewed 11 out of 12 changed files in this pull request and generated 13 comments.
Show a summary per file
| File | Description |
|---|---|
| global.json | Rollback Microsoft.DotNet.Arcade.Sdk, Helix.Sdk, and SharedFramework.Sdk to beta.25509.1 |
| eng/Versions.props | Rollback Microsoft.DotNet tooling package versions to beta.25509.1 |
| eng/Version.Details.xml | Update dependency versions and SHA references to match beta.25509.1 |
| eng/common/sdk-task.ps1 | Remove runtimeSourceFeed and runtimeSourceFeedKey parameters |
| eng/common/post-build/redact-logs.ps1 | Remove runtimeSourceFeed parameters |
| eng/common/post-build/publish-using-darc.ps1 | Remove runtimeSourceFeed parameters |
| eng/common/generate-locproject.ps1 | Fix indentation in localization file processing loops |
| eng/common/core-templates/steps/publish-logs.yml | Remove runtime source feed arguments |
| eng/common/core-templates/steps/install-microbuild.yml | Update MicroBuild installation path and comments |
| eng/common/core-templates/post-build/post-build.yml | Standardize indentation and remove runtime source feed references |
| eng/common/core-templates/job/publish-build-assets.yml | Remove internal source/runtime feed setup steps |
| eng/common/SetupNugetSources.sh | Change disabled source handling from deletion to comment replacement |
| echo "Enabling internal source '$PackageSourceName'." | ||
| # Remove the disabled entry (including any surrounding comments or whitespace on the same line) | ||
| sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile" | ||
| # Remove the disabled entry |
There was a problem hiding this comment.
The comment on line 69 is misleading. The code replaces the disabled entry with a comment rather than removing it. The comment should be updated to say 'Replace the disabled entry with a comment' to accurately describe what the code does.
| # Remove the disabled entry | |
| # Replace the disabled entry with a comment |
| displayName: Enable NuGet validation | ||
| type: boolean | ||
| default: true | ||
There was a problem hiding this comment.
Trailing whitespace added on line 42. This should be removed to maintain consistency with the project's formatting standards.
| displayName: Publish installers and checksums | ||
| type: boolean | ||
| default: true | ||
There was a problem hiding this comment.
Trailing whitespace added on line 47. This should be removed to maintain consistency with the project's formatting standards.
| # If it's not devdiv, it's dnceng | ||
| ${{ else }}: | ||
| ${{ if eq(parameters.is1ESPipeline, true) }}: | ||
| ${{ if eq(parameters.is1ESPipeline, true) }}: |
There was a problem hiding this comment.
Trailing whitespace added on line 172. This should be removed to maintain consistency with the project's formatting standards.
| ${{ if eq(parameters.is1ESPipeline, true) }}: | |
| ${{ if eq(parameters.is1ESPipeline, true) }}: |
| ${{ else }}: | ||
| name: $(DncEngInternalBuildPool) | ||
| demands: ImageOverride -equals windows.vs2022.amd64 | ||
| demands: ImageOverride -equals windows.vs2022.amd64 |
There was a problem hiding this comment.
Trailing whitespace added on line 178. This should be removed to maintain consistency with the project's formatting standards.
| demands: ImageOverride -equals windows.vs2022.amd64 | |
| demands: ImageOverride -equals windows.vs2022.amd64 |
| ${{ else }}: | ||
| name: NetCore1ESPool-Publishing-Internal | ||
| demands: ImageOverride -equals windows.vs2019.amd64 | ||
| demands: ImageOverride -equals windows.vs2019.amd64 |
There was a problem hiding this comment.
Trailing whitespace added on line 300. This should be removed to maintain consistency with the project's formatting standards.
| demands: ImageOverride -equals windows.vs2019.amd64 | |
| demands: ImageOverride -equals windows.vs2019.amd64 |
|
|
||
| - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: | ||
| - ${{ if eq(parameters.publishingVersion, 3) }}: | ||
| - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: |
There was a problem hiding this comment.
Trailing whitespace added on line 94. This should be removed to maintain consistency with the project's formatting standards.
| - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: | |
| - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: |
Reverts commit 50d0b52 which updated dotnet/arcade dependencies from build 20251031.1.
Changes
Arcade SDK versions:
11.0.0-beta.25531.1→11.0.0-beta.25509.1Build infrastructure scripts in
eng/common/:Version tracking:
Original prompt
This pull request was created as a result of the following prompt from Copilot chat.
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.